Auto merge of #1340 - alexcrichton:issue-1329, r=huonw
authorbors <bors@rust-lang.org>
Tue, 24 Feb 2015 00:28:31 +0000 (00:28 +0000)
committerbors <bors@rust-lang.org>
Tue, 24 Feb 2015 00:28:31 +0000 (00:28 +0000)
Closes #1329


Trivial merge